Merge branch 'master' into perf

Kozea · Aug 17, 2019 · feae580 · feae580
2 parents 359536e + b8c19a2
commit feae580
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docs/features.rst b/docs/features.rst
@@ -361,7 +361,7 @@ comes to tables of contents (see `an example
 .. _bookmarks:
 
 You can also control `PDF bookmarks`_ with WeasyPrint. Using the experimental_
-``bookmark-level``, ``bookmark-level`` and ``bookmark-state`` properties, you
+``bookmark-level``, ``bookmark-label`` and ``bookmark-state`` properties, you
 can add bookmarks that will be available in your PDF reader.
 
 Bookmarks have already been added in the WeasyPrint's `user agent stylesheet`_,

diff --git a/docs/install.rst b/docs/install.rst
@@ -437,7 +437,7 @@ environment variable.
 Since you didn't cheat and followed the instructions the up-to-date and
 complete set of GTK libraries **must** be present and the error is an error.
 
-Lets find out. Enter the following command:
+Let's find out. Enter the following command:
 
 .. code-block:: console
 
@@ -471,7 +471,7 @@ Determine the correct folder and execute the following commands, replace
     SET PATH=%PROPER_GTK_FOLDER%;%PATH%
 
 This puts the appropriate GTK at the beginning of your ``PATH`` and
-it's files are the first found when WeasyPrint requires them.
+its files are the first found when WeasyPrint requires them.
 
 Call WeasyPrint again:
 

diff --git a/setup.cfg b/setup.cfg
@@ -4,7 +4,7 @@ url = https://weasyprint.org/
 version = file: weasyprint/VERSION
 license = BSD
 license_file = LICENSE
-description = The Gorgeous Document Factory
+description = The Awesome Document Factory
 long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = Simon Sapin

diff --git a/weasyprint/html.py b/weasyprint/html.py
@@ -307,11 +307,11 @@ def get_html_metadata(wrapper_element, base_url):
         elif element.tag == 'link' and element_has_link_type(
                 element, 'attachment'):
             url = get_url_attribute(element, 'href', base_url)
-            title = element.get('title', None)
+            attachment_title = element.get('title', None)
             if url is None:
                 LOGGER.error('Missing href in <link rel="attachment">')
             else:
-                attachments.append((url, title))
+                attachments.append((url, attachment_title))
     return dict(title=title, description=description, generator=generator,
                 keywords=keywords, authors=authors,
                 created=created, modified=modified,